Skip to content

[Backport 2.x] Create NamedRoute to map extension routes to a shortened name#7631

Merged
reta merged 1 commit into2.xfrom
backport/backport-6870-to-2.x
May 18, 2023
Merged

[Backport 2.x] Create NamedRoute to map extension routes to a shortened name#7631
reta merged 1 commit into2.xfrom
backport/backport-6870-to-2.x

Conversation

@opensearch-trigger-bot
Copy link
Contributor

Backport 8470df6 from #6870.

* WIP on rest layer authz

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Create PermissibleRoute

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update extension handshake

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add connectToNodeAsExtension in TransportService

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update RouteHandler

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update java docstrings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Run spotlessApply

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Fix merge conflicts

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Rename to ProtectedRoute

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Create method to get extension settings from extensions.yml

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add ExtensionsManager.lookupExtensionSettings

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Small change to name

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add to CHANGELOG

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Move extensionSettingsMap.put

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Re-run CI

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add test for ProtectedRoute

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* spotlessApply

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add RouteHandlerTests

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Switch to NamedRoute and add validation for action naming

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Avoid magic numbers

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Remove @test annotation

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update error message

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Check for REST Action name uniqueness across all registered actions

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* minimize code in the test

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Update changelog

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add DynamicRouteRegistry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Address code review feedback

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add mock DynamicRouteRegistry.class

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add RouteRegistry to DynamicActionModule

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Pass around dynamicActionRegistry instead of ActionModule

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Only pass dynamic action registry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Add DynamicActionRegistryTests for tests of dynamic registry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

* Move CHANGELOG entry

Signed-off-by: Craig Perkins <cwperx@amazon.com>

---------

Signed-off-by: Craig Perkins <cwperx@amazon.com>
(cherry picked from commit 8470df6)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@github-actions
Copy link
Contributor

Gradle Check (Jenkins) Run Completed with:

@codecov
Copy link

codecov bot commented May 18, 2023

Codecov Report

Merging #7631 (2b23bae) into 2.x (74e97e1) will increase coverage by 0.04%.
The diff coverage is 82.27%.

@@             Coverage Diff              @@
##                2.x    #7631      +/-   ##
============================================
+ Coverage     70.29%   70.34%   +0.04%     
+ Complexity    59951    59941      -10     
============================================
  Files          4882     4884       +2     
  Lines        288357   288428      +71     
  Branches      41935    41949      +14     
============================================
+ Hits         202697   202884     +187     
+ Misses        68619    68513     -106     
+ Partials      17041    17031      -10     
Impacted Files Coverage Δ
...a/org/opensearch/extensions/ExtensionsManager.java 45.81% <33.33%> (-0.19%) ⬇️
...src/main/java/org/opensearch/rest/RestHandler.java 62.26% <45.45%> (-4.41%) ⬇️
.../main/java/org/opensearch/action/ActionModule.java 94.97% <82.14%> (-0.99%) ⬇️
...a/org/opensearch/extensions/rest/RouteHandler.java 90.00% <90.00%> (ø)
...rch/extensions/rest/RestActionsRequestHandler.java 100.00% <100.00%> (ø)
.../src/main/java/org/opensearch/rest/NamedRoute.java 100.00% <100.00%> (ø)
...rch/rest/extensions/RestSendToExtensionAction.java 47.45% <100.00%> (ø)

... and 508 files with indirect coverage changes

@reta reta merged commit 151af91 into 2.x May 18, 2023
@github-actions github-actions bot deleted the backport/backport-6870-to-2.x branch May 18, 2023 21:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants